Skip to content

Comments

reimbursement wrong highlighting#2053

Open
0xUnicorn wants to merge 4 commits intobornhack:mainfrom
0xUnicorn:bugfix/reimbursement-wrong-highlighting
Open

reimbursement wrong highlighting#2053
0xUnicorn wants to merge 4 commits intobornhack:mainfrom
0xUnicorn:bugfix/reimbursement-wrong-highlighting

Conversation

@0xUnicorn
Copy link
Contributor

Fixes #2044

- Add profile properties for getting expenses and revenues with 'needs reimbursement' status.

- Update expense signal handler to use new property and add new signal handler for revenues.
Comment on lines +83 to +104
def reimbursement_msg_on_login(sender, request, user, **kwargs) -> None:
"""Add message for reminding user about missing reimbursement."""
expenses = user.profile.paid_expenses_needs_reimbursement
if expenses.exists():
msg = (
f"NOTE: You have {expenses.count()} expense(s) with missing "
"reimbursement. Please create a reimbursement once all your "
"expenses have been approved."
)
messages.info(request, msg)


def redisbursement_msg_on_login(sender, request, user, **kwargs) -> None:
"""Add message for reminding user about missing redisbursement."""
revenues = user.profile.paid_revenues_needs_redisbursement
if revenues.exists():
msg = (
f"NOTE: You have {revenues.count()} revenue(s) with missing "
"redisbursement. Please create a redisbursement once all your "
"revenue(s) have been approved."
)
messages.info(request, msg)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
def reimbursement_msg_on_login(sender, request, user, **kwargs) -> None:
"""Add message for reminding user about missing reimbursement."""
expenses = user.profile.paid_expenses_needs_reimbursement
if expenses.exists():
msg = (
f"NOTE: You have {expenses.count()} expense(s) with missing "
"reimbursement. Please create a reimbursement once all your "
"expenses have been approved."
)
messages.info(request, msg)
def redisbursement_msg_on_login(sender, request, user, **kwargs) -> None:
"""Add message for reminding user about missing redisbursement."""
revenues = user.profile.paid_revenues_needs_redisbursement
if revenues.exists():
msg = (
f"NOTE: You have {revenues.count()} revenue(s) with missing "
"redisbursement. Please create a redisbursement once all your "
"revenue(s) have been approved."
)
messages.info(request, msg)
def reimbursement_msg_on_login(sender, request, user, **kwargs) -> None:
"""Add message for reminding user about missing reimbursement."""
expenses = user.profile.paid_expenses_needs_reimbursement
revenues = user.profile.paid_revenues_needs_redisbursement
if expenses.exists() or revenues.exists():
msg = (
f"NOTE: You have {expenses.count()} expense(s) and "
f"{revenues.count()} revenues(s) with missing "
"reimbursement. Please create a reimbursement once all your "
"expenses and revenues have been created and approved."
)
messages.info(request, msg)

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

reimbursements cover both expenses and revenues, changed the wording a bit and changed so there is only 1 message

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Unreimbursed expenses are counted incorrectly on login

2 participants